527ce9d6a148e9e81baa145fb1b0e9cc53d2505f,java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java,JavaVariableConflictResolver,resolveConflict,#List#,36

Before Change


        }

        if (oldClassIsInheritor == null) {
          oldClassIsInheritor = oldClass.isInheritor(newClass, true);
        }
        if (oldClassIsInheritor) {
          // both fields are accessible

After Change


        }

        if (oldClassIsInheritor == null) {
          oldClassIsInheritor = oldClass != null && newClass != null && oldClass.isInheritor(newClass, true);
        }
        if (oldClassIsInheritor) {
          // both fields are accessible